[Backport release-23.11] checkpointBuildTools: init#279953
Merged
roberth merged 6 commits intoNixOS:release-23.11from Jan 13, 2024
Merged
[Backport release-23.11] checkpointBuildTools: init#279953roberth merged 6 commits intoNixOS:release-23.11from
roberth merged 6 commits intoNixOS:release-23.11from
Conversation
incremental builds: add derivation override functions (cherry picked from commit 5eed541)
All other functions are in the form of `*{c,C}heckpointBuild*`, so we
deprecate the `mkCheckpointedBuild` function in favor of `mkCheckpointBuild`.
Also address some inconsistencies in the docs: some `buildOutput` should
actually be `incrementalBuildArtifacts`.
(cherry picked from commit df62c3c)
Add some minor improvements of the package, and use temp files for the source difference patch, such that it is more reliable. This follows from the suggestions of @infinisil. Co-authored-by: Robert Hensing <roberth@users.noreply.github.com> (cherry picked from commit 5f3aad0)
... following suggestions from @phip1611 and @infinisil. (cherry picked from commit d7253be)
Was broken since introduced, but not caught due to NixOS#271123 (comment) (cherry picked from commit 6946071)
Member
Author
|
@ofborg build tests.checkpointBuildTools |
roberth
approved these changes
Jan 11, 2024
| }); | ||
|
|
||
| mkCheckpointedBuild = lib.warn | ||
| "`mkCheckpointedBuild` is deprecated, use `mkCheckpointBuild` instead!" |
Member
There was a problem hiding this comment.
Suggested change
| "`mkCheckpointedBuild` is deprecated, use `mkCheckpointBuild` instead!" | |
| "`mkCheckpointedBuild` is deprecated; use `mkCheckpointBuild` instead." |
"," doesn't join sentences; only clauses. However, ";" can and "." does.
Member
There was a problem hiding this comment.
I actually expected a change to this line, reading about alias warnings, but apparently we're allowed to warn in this attribute. Not sure why, or whether this means we could warn in the aliases file, but great!
Member
Author
There was a problem hiding this comment.
Whoops, indeed! I will try to "forward-port" the grammar fix to master next time, perhaps bundled with some other improvements of checkpointBuildTools.
Member
There was a problem hiding this comment.
It's not a big deal tbh, but I just can't help it.
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Human-based backport of #279487, #167670 and part of #278777 to
release-23.11, following instructions from the bot in #279487 (comment).Note that the initial PR #167670 is actually, not in 23.11, so for this update to apply consistently, I have to backport the parenst as well, therefore the subject has become
checkpointBuildTools: init:If this is undesired, feel free to close! @roberth
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.